Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Sep 2011 19:50:44 +0000 (12:50 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Sep 2011 19:50:44 +0000 (12:50 -0700)
commitd2577f947e19503a7417a13edfd9d09b143169a6
treee182d0f041d3d393710a6e1db4cc2bfb0d9178d6
parent9de7e9a888212f1efd1127eb9fdf5101e16de4a7
parentcf4223ba8c46c3f2f4212885aefd1653690ea620
Merge from trunk.